add forgotten changes (for import style and use of python2)