Some formatting adjustments