Refactoring class Choice.java