Cleaned up the build script a bunch