small cleanup of scopes in views