lint fixes
Merge pull request #395 from cpirich/master

lint fixes