Making updates suggested by the linter