Misc comment block cleanup