sandesh, simij | #196 | Minor refactoring