Bit of code re-org.