AUI-1619 Source Formatting