Fix formatting for PEP8 compliance
More PEP8 formatting fixes