AUI-1051 Source formatting