enhance readability

Change-Id: If740b080fa35984fe493889c5423b9dc154fe167