STY: Fewer pyflakes warnings