Minor tidy  up.