make code nicer

Change-Id: I474514efdc5fef30ddb8c94f7a96e309bf151382