Resolve foodcritic and rubocop warnings