Removed old function and moved McWeight function creation into its own method