Cleanup, and comments