Code refinement + structure refinement..