moar formatting fixes