Fix some short quotes
Move some scopes to the model