Changing properies and class attributes to be PEP8