Clean up of digitizer and addition of clustering