PEP8 and CHANGES fixes