PEP8 + remove some piece of code.