Remove redundant if/else caluse in Data().__init__()