fixed gq refactor to pass linter