code cleanup for linter