happy refactoring going on