fixes #7660: fixes first bunch of rubocop warnings

Hmmm... what's this change for?