Fixed some style issues with old code Hound complained about