Small code cleanup.
Merge pull request #2 from tLewisII/code_cleanup

Small code cleanup finished.