Coding Style cleanyp; update CHANGELOG