massive rubocop cleanup