removing white spaces

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

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

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