fixed linter errors and warnings