AUI-1409 - Source formatting