Clean up of comments and formatting.