Refactor of build commands.