fix a foodcritic violation
cherry pick commits from grizzly