Refactor diagram questions