Tidy up previous commit.
4 files changed