GUI-1240: Minor PEP8 cleanup