AUI-1491 Source Formatting