I think it would be good to refactor our code and then make a clean commit. @rohitshubham @rudraabhilash
