Reordering + Nicer comments in src/data.ml