Cleaned up scopes