refactor bon voyage example