lots of changes
More modifictions with a autopep8 pass