Code Cleanup

Signed-off-by: Deepak Bansal <deepak.bansal@snaplion.com>