Bloody refactoring