PEP8 + Access rules fix