more updated rubocop cleanup