(#108) Removed underscore from worker, refactored