Reorder and improve comments of main variables.