Fixing code to be PEP8