CE-1125 Implement CR suggestions