HHH-9142 cleaned up formatting to better match original