Cleanup

* Code reformat
* Update copyrights