Refactoring, maybe