jobs management refactoring - not perfect -