Reflow and fix mistakes

Change-Id: Id882c83ead969eafdbdb8a2b3609dce862f8bab5