Bit of a tidy ahead of some rework.