Made things flatter and nicer, added check for unique candidate names