check-in before routes refactor