Cleanup of comments in code