Refactored to make app safer and queries run faster
Merge pull request #19 from pdarden/refactor_v1

Refactored to make app safer and queries run faster