Putting some order in the DB