Applied comments from previous commit.