a bit of re-organizing