removed fixer classes, introduce nested class AccountNumberFixer