Fixed pyflakes issues