AUI-1192 Source formatting