Addressing rubocop gripes