AUI-1466 Source formatting