Stylistic fixes for all the classes