Fix linter errors and do some code clean up
Merge pull request #705 from platogo/fix-linter-errors

Fix linter errors and do some code clean up