Fixing some pyflakes suggestions