Refactor|SectorCluster: Consolidated various logics used during Shard preparation