Cleaning up comments

[merge]