As per code Review - Make changes

As per code Review - Make changes