AUI-1545 - Source Formatting