Refactor classes for readability