Refactoring
Added candidate name