more rubocop fixes