tiny bit of re-organization