AUI-1332 Source formatting