[Refactor] Modified RDD and decreased shuffle