Proposed changes to rswanson's PR #7

PR includes namespace changes, typo fixes, and small code changes.