Tidying up views and making clear a bit safer