cleaned things up a bit
Merge pull request #1 from wegry/master

cleaned things up a bit