Vinay | #431 | Minor refactoring