A few basic cleanups
Merge pull request #2 from darkwing/cleanup

A few basic cleanups