Linting and refactoring (also load and save put in scope)