[Shantanu]
Refactor