Refactor! MVVM!