MADS: Some refactoring in scene 402