Oh yeah, they can def use some refactoring. Didn't do it at the time in lieu of trying to get the tests written and the code tested before getting detoured into premature test cleanup. But they totally need it.