AUI-1187 Source formatting