Addresses the comments from 2nd commit.