AUI-1821 Source formatting