A bit of code re-org