Minor cleanup of comments