Refactor questions

closes #51