Add new comments and formatting