Simplify code

Change-Id: Ibe6ed10439863771c8217ddd355e8e08468d2559