Refactored and perfected workers