Some cleanup of the #1101

- pep8
- Added changelog entry