Fix linter errors
Merge pull request #689 from platogo/develop

Fix linter errors & typos