CE-1162 Code Review follow up