MDL-32862 - Backup: Tidy up of the code to meet coding standards.