Add style ability
Clean up the query building code