Clean up build.py a bit