AUI-1575 - Source formatting