Correct comments and line spacing