consolidate core
refactor dataset