Kept functionality but simply re-ordered parameters and switch statement for neatness and clarity
Kept functionality but simply re-ordered parameters and switch statement for neatness and clarity

mprovost/NFSping,mprovost/NFSping,mprovost/NFSping