adjusts naming and formatting of class definition