Query Parser: refactored visitors to be more clear in concept