Fix coding style issues found by Hound