starting cleanup, lint and flake