Refactoring & MVVMization