Restructured some sql-code and comments to fit the rest of the files