PEP8 compliance
New solutions