Scrap unnecessary scope
Add comments to return to
Update
Remove unused view
Update