Fix redefination error
and legibility up

Change-Id: I26c139d953da03be9fcdc572c32324c16e0f06d2