Cleaning up Clusense a bit