questions tidy up