rubocop conversion
rubocop cleanup