Cleanup and comments