Change non-PEP8 compliant statements