Making some classes more readable