AUI-1162 Source formatting