Fixed syntax issues found from linter