More cleaning, especially in the view package.