Code refactoring/simplification. Issue #9714
Code refactoring/simplification. Issue #9714

dennypage/pfsense,NewEraCracker/pfsense,pfsense/pfsense,dennypage/pfsense,dennypage/pfsense,dennypage/pfsense,NewEraCracker/pfsense,phil-davis/pfsense,pfsense/pfsense,phil-davis/pfsense,pfsense/pfsense,pfsense/pfsense,phil-davis/pfsense,NewEraCracker/pfsense,phil-davis/pfsense,NewEraCracker/pfsense