Update memories
More fixes suggested by flake8