Minor bugfix/code cleanup

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>