#21738 - Tidied code a bit