more dumb refactoring