XD-523: allow hyphens in module/stream names and polish

This addresses XD-523 and so allowed hyphens in module names.  It also includes some minor changes to address sonar reported violations.