cleanup and sorting add