Tightening up an edge case and standardising formatting.