Filter is done
Sorting is ready
Clean up a bit