Refactoring: remove DataType from module namespace