PEP8, unicode fixes