Working on enforcing PEP8 compliance