AUI-1349 - Source formatting