CLSN-563 Code Review Issues : Soham
issue no 19,30