AUI-1026 Source formatting