lint fixes
Merge pull request #671 from maestrodev/lint

lint fixes