such a fat refactoring goes