framework update + fix for complying with PEP 8  (again...)