Fix some comments and style