AUI-1576 - Source formatting