Some random linter cleanup