A bit of clean up on the previous commit.