Cleaning up and adding comments