Update for more linter improvements