[#656] PEP8-ish fixes