Code QA for GPC#296