changed to MVVM Application + clean up