AUI-1348 Source formatting