AUI-1003 Source formatting