PEP8: applied even more rules