Minor changes, reordering while writing