refactoring, I guess