Cleaning up and commenting.