Bit of re-organization