Minor clean-up
Expand all by default