Fix misplaced end separator marker
Split apart long lines
Fixes for Python 3