Refactor Jenkins a bit