address comments.
JIRA:ARAKOON-375