Code style updates to make Hound happy