Refactor View