Cleanup some rubocop warnings