Some code cleanup.
Merge pull request #8 from arc90/cleanup

Some code cleanup.