Clean up and commenting.