minor expand cleanup