Cleanup for linting