AUI-1670 Source formatting