code cleanup

Change-Id: Ia361bb6062d791c79ba0e84f82566cd3af9211c0
update license

Change-Id: I4e4e9c17dc352aef401fe2a71f69a3de81edef48