Some linter cleanups