Cleanup and commenting.