Refactoring

  Avoided partitioning