refactoring of build job