Issue #128: PEP8 compliance