Refactoring Data Type