AUI-1460 - Source formatting