Fix untracked files
Refactor scopes