A little bit of cleanup
Sorting is coming