comments and cleanup, round 1