Code clean up
work in progress

Signed-off-by: sanoj <sunnikrishnan@stec-inc.com>