Cleanup to meet linter