Refactor review tour