Refactoring + adding a callback option right before a job starts