Refactor Answer
Refactoring