minor reordering, remove some unnecessary comments