Ajusted clustering class and modified executer to run clustering