ticket: 13 pyflakes fixed