Refactor nos scopes. 5,5h it closes #131