Code simplification: full structure for SIVIA argument