lint and style fixes.
Merge pull request #1 from kennethlakin/master

Style and lint fixes.