AUI-1111 - Source formatting