code clean up.
Merge pull request #1 from brentschmaltz/master

code clean up.