Pep8 spelling simple fixes

No major stuff here, but it looks HUGE! Went through everything (and hopefully not miss anything) to find anything that catches my eye before I even think of doing an actual refactoring (some bits are painful to see and I believe may came from me in the past)

* Added and/or removed some lines between classes and functions
* Renamed some variables so that they are clearer to read
* Removed redundant brackets
* simple clean ups