Misc cleanup of comments