Fix for defect #450 - Minor re-factoring.
Fix for defect #450 - Minor re-factoring.

Flatlineato/Humanizer,jaxx-rep/Humanizer,schalpat/Humanizer,Flatlineato/Humanizer,ErikSchierboom/Humanizer,ErikSchierboom/Humanizer,schalpat/Humanizer,MehdiK/Humanizer,aloisdg/Humanizer,hazzik/Humanizer