Refactor Answers