[BL] Refactor