Minor tidy up
After merge