simplified scopes and updated comments