Some more polishing to viewmodel