More Rubocop warnings fixed

It is now following `Fog` main repo style guide.


Do these sorts of changes break any of the rubocop rules?  It doesn't look like they do to me, but I may just be overlooking something.  If not, I'd rather keep them out of the rubocop changeset.