Using the model's title in the chooser
Code cleanup