commented and formated

Change-Id: I6d2c51ceaca8662e3b6d47ceeecbc45d0109d0df