Improved formatting of certain classes