Refactoring Data-Class