Simplified the build process