PERF: simplify - no aux vars