[TASK] Cleanups and added early returns in ExtendedTemplateView