Touched up code from last commit.