Fix issues reported by new foodcritic