Shifting some code about, some of which can be shared by a future module.