AUI-1610 Source formatting