AUI-1179 Source formatting