AUI-950 - Source formatting