Gs 11239 Refactoring based on CR comments