clean up, finished sql syntax abstraction