improving code readability

Change-Id: Ia94c9ede5bfe4e8f36270a8dab6382bef57be5ab