Clearing up and adding comments