AUI-1151 Source formatting