SFR463000 - code review markups (remove code duplication)