changes to accomodate review comments on previous version

Signed-off-by: Babu Shanmugam <anbu@enovance.com>