Updated and simplified build script