PEP8 + clean up old dirs