Minor code cleanup. Update CHANGELOG.
3 files changed