AUI-1635 Fix lint problems
AUI-1635 Source formatting