Refactor sae