SOL-20 PEP8 fixes