parser cosmetic changes
Parsing sql cleanup