Addressed pranav's code review comments.