Minor code reorg
Minor code reorg

stevage/when,SourcePointUSA/when,ning-github/when,frank-weindel/when,caporta/when,DJDNS/when.js,tkirda/when,caporta/when,tkirda/when,petkaantonov/when,mlennon3/when,anthonyvia/when,anthonyvia/when,SourcePointUSA/when,frank-weindel/when,stevage/when,ning-github/when,mlennon3/when