Move to use MCWeighter
Do a little code cleanup