soubrette refactor