Fix some formatting issues