refactoring: remove Q from parser