simplified code.

Change-Id: I2306bb57f4334085715e5c8e593d95a78d347dee