minor syntax fixes
Merge pull request #22 from joelanman/clear-up

minor syntax fixes