AUI-1064 Source formatting