AUI-1364 Source formatting