PEP8 adapations