AUI-924 - Source formatting