#87 - Format adjustments