AUI-1335 Source formatting