Fixed formatting in all classes