Refactoring and simplifying code for nomination (bug 717495)