rubocop, massive style changes