PEP-8 ifiying EVEN further