AUI-1034 Source formatting