Bug fix and code cleanup (fixes #606)

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

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

Bug fix and code cleanup (fixes #606)