Refactor and improve datas.