Unicorn refactoring