AUI-1002 - Source formatting