Fix stylistic problems pointed out by Hound