Fix up helper / model optimisation and adjust views to use the helper correctly