[Akash/Sailee] Refactor