optimize and clean up
more optimizations
build