More PEP8 and string formating fix