Cleanup
SQL Cleanup
small adjustments