refactor adding answers logic