AUI-1205 Source formatting