code clean

Change-Id: I5ba6c1a676e445fd66c3e8303ed1415e4663cfcb