Refactoring + choice.txt