AUI-1212 Source formatting