refactor RawData