rearrange a bit to be a better library citizen