Reorganizing and adding comments