Ajay/DC | #3086 | Minor refactoring