PEP8 and string formatting changes