Style fixes.
Merge pull request #68 from apenney/style

Style fixes.