Updated comment
Updated change log
Code reformat