Apply CodeStandards fix