PEP-8 ifiying further