Fixed final linter errors