cleanup logic, based on @tschaub's code review
cleanup logic, based on @tschaub's code review

jean-emmanuel/yargs,tepez/yargs,ggoodman/yargs,jean-emmanuel/yargs,yargs/yargs,zkat/yargs,elas7/yargs,oti/yargs,LoicMahieu/yargs,dkoleary88/yargs,yargs/yargs,nexdrew/yargs,ammeep/yargs,ammeep/yargs,jvdm/yargs,ChristianMurphy/yargs,sgentle/yargs,geophree/yargs,bcoe/yargs,dkoleary88/yargs,nexdrew/yargs,bcoe/yargs,geophree/yargs,elas7/yargs,etiktin/yargs,tepez/yargs,yargs/yargs