refactor opinion to close data tracking