Refactoring to make classes more descriptive