Tidying things up, still addQuestion.js to do