Added candidates method, mid clean-up