improved formatting and build process