Refactor invitation answer