Minor cleanup
Merge pull request #18 from mnriem/work

Minor cleanup