Feature/sort by cleanup