Tidying sql output
Merge branch 'format-sql'