Huge cleanup; .7 kb performance increase; dev 0.3.4