Refactor classes and methods for better readability and code practice