refactor/simplyfy jobs.xml parsing classes