Refactor social workers