Minor refactoring
Minor refactoring

jitsni/gateway,stanculescu/gateway,kaazing/gateway,jfallows/gateway,nemigaservices/gateway,adrian-galbenus/gateway,adrian-galbenus/gateway,mgherghe/gateway,Anisotrop/gateway,danibusu/gateway,chao-sun-kaazing/gateway,sanjay-saxena/gateway,AdrianCozma/gateway,stanculescu/gateway,cmebarrow/gateway,a-zuckut/gateway,DoruM/gateway,michaelcretzman/gateway,jitsni/gateway,justinma246/gateway,Anisotrop/gateway,jfallows/gateway,AdrianCozma/gateway,kaazing/gateway,biddyweb/gateway,biddyweb/gateway,a-zuckut/gateway,dpwspoon/gateway,a-zuckut/gateway,mgherghe/gateway,irina-mitrea-luxoft/gateway,sanjay-saxena/gateway,a-zuckut/gateway,Anisotrop/gateway,michaelcretzman/gateway,mjolie/gateway,DoruM/gateway,jitsni/gateway,kaazing/gateway,danibusu/gateway,mgherghe/gateway,nemigaservices/gateway,Anisotrop/gateway,DoruM/gateway,michaelcretzman/gateway,chao-sun-kaazing/gateway,chao-sun-kaazing/gateway,justinma246/gateway,sanjay-saxena/gateway,justinma246/gateway,vmaraloiu/gateway,mjolie/gateway,stanculescu/gateway,vmaraloiu/gateway,chao-sun-kaazing/gateway,dpwspoon/gateway,cmebarrow/gateway,dpwspoon/gateway,nemigaservices/gateway,AdrianCozma/gateway,cmebarrow/gateway,nemigaservices/gateway,danibusu/gateway,justinma246/gateway,jfallows/gateway,irina-mitrea-luxoft/gateway,vmaraloiu/gateway,biddyweb/gateway,adrian-galbenus/gateway,mjolie/gateway,dpwspoon/gateway,irina-mitrea-luxoft/gateway,danibusu/gateway,mjolie/gateway,jitsni/gateway,irina-mitrea-luxoft/gateway,cmebarrow/gateway,stanculescu/gateway,sanjay-saxena/gateway,adrian-galbenus/gateway,AdrianCozma/gateway,vmaraloiu/gateway,DoruM/gateway,biddyweb/gateway,michaelcretzman/gateway,jfallows/gateway,mgherghe/gateway,kaazing/gateway