a bit of restructuring