Minor cleanup.
Minor cleanup.

dilawar/ncbs-hippo,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-hippo,dilawar/ncbs-hippo