All code fixed to be PEP8 compliant