change format
refactor Dataset
complete NB