Update view
Remove redundancy