All pyflakes warnings addressed