Minor cleanup, add COPYING

Change-Id: I9e0ccb4dcb970130653061d9e45da3783917973d