Build script cleanup
Build script improvemnets