Slight change so that data-binding into views is consistent
Removing redundant code in the models