[PEP8] cleanup [WIP]