Way less globals

Lets see if the commit comments appear here
Empty line or two after the class will make it easier to read and pep8 happier.