AUI-1686 Source formatting