Making classes a bit more readable