Epic refactoring performed