dataset refactoring
minor
changed commands