Refactoring spacing and formatting of classes