Copyright update
Code reformat