Modify format to PEP8 style