MHN module reformatting tweaks