clean up expander a bit