Small code cleanup with vulture and pyflakes