some refactoring for hound