An other round of rubocop fixes