Tidied ViewModels.