Refactor cluster decomposer