Better formatting and organization for the class