AUI-1453 Source formatting