AUI-1065 Source formatting