refactoried job & user