Refactor Dataset