Improved formatting of generated classes