Some cleanup for linting