has refactoring gone too far?