Fixed offences
Upgrade rubocop and fixed new offences