Refactoring and simplifying code for nomination (bug 717495)
Merge pull request #373 from davidbgk/717495-a-new-hope

Refactoring and simplifying code for nomination (bug 717495)