More major reformatting in line with PEP8

Globals now reformatted