addressing code review comments - phase 1
remove and sort using
minor update