Cleaning up and comments