Refactor cluster eval a bit