Last PEP8 changes