CS fixes

Some CS fixes for comments.