refactoring eliminating duplication but not the fake