Cleaning up, commenting.