take care of review comments from Nadev

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>