general formatting improvements and standardisation