Also added some lines for better readability.

This is a follow-up patch of c8b7aa55.

Change-Id: I50e6c05141ef3b8db70302d8853b46c38414c6d5