some lintian work, clean flake8 errors
clean parsing of node