Anishek/Ajay | #2409 | Refactoring - extracted duplication