AUI-1420 Source formatting