small changes to simplify answer and question classes