"Cleanup" and comments