PEP8 + cleanup