AUI-1053 Source formatting