PEP8 & cleanup