AUI-1410 - Source formatting