Made fixes PEP8 compatible