Changes made during refractor session with Sumeet!