clean up and fix up

Change-Id: Ib3005ad0eadbeb588a7a02f0187d63ed7004af73