AUI-1395 - Source Formatting