a refactor too far