AUI-1577 - Source Formatting