Refactoring
VoID dataset model entity
VoID parsing
Refactoring & cleanup