code cleanup to pass linting