Improve view code.