incremental simplifyication/commenting...