AUI-1358 - Source formatting