Multiple small comment and code edits