Simplify with Struct
Recovering lost test; small cleaning