PIM-1526 : Clean EditCommonAttributes code decreasing complexity