Fix scopes
Add comments