Clean up simple formatting issues