PEP8 cleaning (I don't find it cleaner, but OK)