update intersphinx link: *we* work with Python 3.2
refactor functions again