Additional minor code optimization
Merge pull request #13 from bullcitydave/code-cleanup

Additional minor code optimization