refactored the sql parts into a seperate file
removed outcommented sql