Minor code cleanup
Merge pull request #14 from bullcitydave/code-cleanup

Minor code cleanup