IN , praveen | #1069 | Implemented code review comments