Code review changes

Signed-off-by: puneet <puneetgoyal300@gmail.com>