sort out the structure a bit