Add comments and clean

Change-Id: I26dfdbe2f0b278a65d7fac85bfadb68312dd6cde