mc_tools : minor clean up