AUI-1379 - Source formatting