refactoring heh