Fixed for keys of length 80 and 96
Minor formatting