Small tour code cleanup