Better style for python
Simplified sqlQueryGenerator.py