Refactoring of monster code, plus test level!