Minor cleanups.
Merge pull request #70 from cgay/dev

Minor cleanups.