Update to formatting for the classes