Bestial refactoring