Take care of rubocop offences
Fixes after rubocop