Merge pull request #2747 from devoncarew/refactor_build

Refactor the build commands