Fixes Issue #236 code cleanup

As discussed in issue #236, this is a collection of commits to clean up various items in the code base.  Each commit has descriptive regarding the changes.