Renaming and remove unnecessarry sort