More cleaning up in view.