Small refactoring for data-types