Formatting classes did not fit my coding style :P