Code formating
SQL generation improvements