Apply some formatting fixes