Minor bugfix/code cleanup

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #406 from Oldiesmann/release-2.1

Minor bugfix/code cleanup