* clean up some logic rebase and reorder phase add log and modify e2e-test fix reviwable fix comment * fix condition relate comments finish test func fix formate error