refactor job data functions