Fixed pep8/pyflakes issues