View focused code refactor.