Simplification due to scope changes