Refactoring, kinda