Convert to automatic disposable handling
Add missing break statement
Firther improvement on the templated views.