Contributing: minor reordering and structuring