Adding comments and edit format