Adding changes suggested in code review

Signed-off-by: sajith <sajithshn@gmail.com>