Furthermore cleaned up the code for comments within SQL statements