Fix some comments and indent style