Refactor
XLAT