Streamline build script a bit