Fix style issues found by Hound