Refactoring + View