Simplify nested level a bit