Simplify viewmodel logic