Code cleanup.
Merge pull request #6 from gangsterveggies/code-cleanup

Code cleanup.