Refactored into Fixer classes