Applied comments for the previous patch. Pushing
one more patch on top of it.

Signed-off-by: ashwith <ashwith@experinn.info>