Jenkins refactor