Made the class easier to understand