Streamlined the build process