AUI-1079 Source formatting