AUI-1173 Source formatting