Topic code review changes