Iss #62 - Resolve some of the code smell in the common lib

Various issues discovered through new Sonar scanning that while not bugs, made code less maintainable. This addresses some of those issues.