Some linter cleanup