Linting

Minor refactor to make lint pass