Fixed formatting and build environment