Model selection tidy up