blockclust: src code cleaning