Refactor episode data object