Extract Fixer classes to fixer.py #491