Minor clenaup
Minor cleanup
Merge pull request #32 from cdeil/some_cleanup

Some cleanup