refactoring for jenkins build