Clean up and improve the CrossFilter