One-Pan

minimal cleanup