merging changes

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
merging changes

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
changes according the feedbacks

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
refactoring

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>