a bit of restructuration