Code cleanup. Update CHANGELOG
6 files changed