refactoring continues
getting better - only 6 fails on refactor