AUI-1106 Source formatting