Reorder and remove some obvious comments