AUI-1485 - Source formatting