Fixed formatting (applied PythonTidy), split SQL requests
Merge branch 'feature/realign'

* feature/realign:
  Fixed formatting (applied PythonTidy), split SQL requests