fix linter errors/warnings + 2 space indent