Minor code cleanup; update CHANGELOG.
3 files changed