Updated PEP8 format