AUI-1685 Source formatting