AUI-1177 Source formatting