Refactoring and minor improvements
Refactoring and minor improvements
pfirmstone/JGDMS,pfirmstone/river-internet,pfirmstone/JGDMS,pfirmstone/river-internet,pfirmstone/river-internet,pfirmstone/JGDMS,pfirmstone/JGDMS