Finaly tidying of the dataset + ordering