Resolved PEP8 related warnings