cleanup & PEP8 compliance