Few clean-ups to build script - used Zip task