Starting to clean-up prior to moving to real models and view models