Cleaning up and updating comments