AUI-1146 Source formatting