Clean up views a bit