Code cleanup. Update CHANGELOG.