Reformat HLT menu

Remove trailing spaces, and explode the code we care about for easier
reading.