Clean-up multi-line queries