Cleaning up the comments and extra lines