Reformatted misformatted classes (AHEM...TheMike...)