refactor for Jenkins CI