Updated formatting
Hacking on query builder