ho-ho. refactoring