Refactoring with Answers classes