Synchronous long jobs; some code refactoring