Standardised code even further