A refactor too far