Clean up views a little