MNT : PEP8 clean up + removed done todos