PEP 8 and removal of unused stuff