Go through code changes

Signed-off-by: nithin1992 <nithin.nik@gmail.com>