CHANGELOG maintainance and code style