Refactor View Controllers