Indentation and caching amends