Code Cleanup

Signed-off-by: sanoj <sunnikrishnan@stec-inc.com>
More Code cleanup
Work in progress

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