AUI-1577 - Source formatting