hound and small refactoring