Fix incorrect comments and comment spacing