Use same rules for Hound as Machinery
Fix style issues