Code cleanup. Update CHANGELOG