Final cleaning
Fix on number of question