AUI-1281 Source formatting