Fixing pyflakes issues