comment and cleanup