General Refactoring & Cleanup

Cleanup extraneous and consolidate code throughout
Minor Bugfix in Category Winners HTML

Fixed code left broken by migration to the Test enumeration system