Code refector
PEP8 fixes