Some more cleanup for linting