Minor tweaks and tidy up

Tidying up the way the model is cleared when modifying streams and
extracted build numbers to a separate property