Refactor reveal answer