Change candidate according to new doc

- Change candidate according to new doc
- Cosmetic changes