Upgrade rubocop development dependency
Several refactorings and keep rubocop happy