Build script tidy