Brushed up half of the classes to be PEP8 compliant