Cleaned up sql
Merge pull request #32 from johnmannpaul/master

Cleaned up sql