Further PEP8 compliance