Refactoring. Oh, refactoring