add some copyrights (just for fun) :P

Change-Id: I354fb20d3c8e8fcfecbacc57c70e6256481b0989
cleanups, and add a missing line

Change-Id: Iabdcc6d112058d63e48ce1dd273e7ba3f579398f