Updated the code for reviews

Signed-off-by: Roshan <roshanbhgt@gmail.com>