2nd commit of Clusense refactoring