AUI-1467 Source formatting