Updated changelog
Reformat & small optimization