#1318 - Suganthi/Yekkanti - Refactorings