Comply with pep8, pyflakes