PEP8 cleaned